Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump psalm/phar from 4.30.0 to 5.1.0 #7725

Merged
merged 10 commits into from
Dec 13, 2022
Merged

Bump psalm/phar from 4.30.0 to 5.1.0 #7725

merged 10 commits into from
Dec 13, 2022

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Dec 3, 2022

Bumps psalm/phar from 4.30.0 to 5.1.0.

Commits
  • 43a6cee Updated Psalm phar to commit 4defa177c89397c5e14737a80fe4896584130674
  • acfae5c Updated Psalm phar to commit 4defa177c89397c5e14737a80fe4896584130674
  • 940ab4e Updated Psalm phar to commit 433e2721492a8cede554f73627ff7bb721646fb7
  • e272267 Updated Psalm phar to commit b4aa951caaf958c1f51749d90f94c6b57d4a6809
  • 27bb7fc Updated Psalm phar to commit aee460504142a8a5734ec89babee61382a56bced
  • d20ac9d Updated Psalm phar to commit 870f5817d22c16477b8cd7abf1a83d4032529276
  • 2d3515c Updated Psalm phar to commit 4e177bf0c9f03c17d2fbfd83b7cc9c47605274d8
  • fa3e4c7 Updated Psalm phar to commit 6fff6dfc65558bf3e4b33bdd2705626d8c5ceadc
  • 49b13ac Updated Psalm phar to commit 9d597cf370b365816eee0207d7f07aac9f203128
  • 627f196 Updated Psalm phar to commit 94dac9f9e754bc9e6d1f9a3d196d50c42e7ac9eb
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

@dependabot dependabot bot added 3. to review dependencies php Pull requests that update Php code labels Dec 3, 2022
@kesselb
Copy link
Contributor

kesselb commented Dec 6, 2022

ERROR: InvalidArgument - lib/Service/ContactsIntegration.php:183:59 - Argument 3 of OCP\Contacts\IManager::search expects array{enumeration?: bool, escape_like_param?: bool, fullmatch?: bool, limit?: int, offset?: int, strict_search?: bool}, but array{limit: 1, types: true} with additional array shape fields (types) was provided (see https://psalm.dev/004)

nextcloud/server#35632

@dependabot @kesselb
Bump psalm/phar from 4.30.0 to 5.1.0
a7a4873 
Bumps [psalm/phar](https://github.com/psalm/phar) from 4.30.0 to 5.1.0.
- [Release notes](https://github.com/psalm/phar/releases)
- [Commits](psalm/phar@4.30.0...5.1.0)

---
updated-dependencies:
- dependency-name: psalm/phar
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@kesselb kesselb force-pushed the dependabot/composer/psalm/phar-5.1.0 branch 4 times, most recently from f523fa3 to f30c256 Compare December 7, 2022 17:58
@kesselb
docs: annotate the implemented interface
5c74455 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
docs: annotate the extendes classes
48d5172 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
feat: compatibility layer for legacy exceptions
118671f 
Client- and ServiceException is the bridge from Horde to Mail.

Some exceptions from Horde may return a non-numeric exception code.
To avoid type errors the exception code is converted when non-numeric.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
feat: remove cast to int
fa5830b 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
docs: add type hint for psalm
92192b9 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb force-pushed the dependabot/composer/psalm/phar-5.1.0 branch from f30c256 to 92192b9 Compare December 7, 2022 17:59
@kesselb
Copy link
Contributor

kesselb commented Dec 7, 2022

ERROR: UndefinedPropertyFetch - lib/Service/MimeMessage.php:88:34 - Instance property DOMDocument::$documentElement is not defined (see https://psalm.dev/039)
$htmlContent = $doc->saveHTML($doc->documentElement);

ERROR: UndefinedPropertyFetch - lib/Service/MimeMessage.php:168:49 - Instance property DOMElement::$tagName is not defined (see https://psalm.dev/039)
if ($node instanceof DOMElement && strtolower($node->tagName) === 'p') {

ERROR: UndefinedPropertyFetch - lib/Service/MimeMessage.php:169:11 - Instance property DOMElement::$textContent is not defined (see https://psalm.dev/039)
return $node->textContent . "\n";

vimeo/psalm#7567

@kesselb
build: replace christophwurst/nextcloud with nextcloud/ocp
d60325c 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
build: update psalm baseline
969f39c 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb force-pushed the dependabot/composer/psalm/phar-5.1.0 branch from fe9e094 to 969f39c Compare December 7, 2022 19:54
@kesselb
build: replace christophwurst/nextcloud with nextcloud/ocp package
340e222 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
kesselb
kesselb reviewed Dec 12, 2022
View reviewed changes
lib/Exception/ServiceException.php
* @param null|Throwable $previous [optional] The previous throwable used for the exception chaining.
*/
public function __construct($message = "", $code = 0, Throwable $previous = null) {
if (!is_int($code)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChristophWurst I'm unsure about the constructor. Psalm mentioned the redundant int casts. ServiceException is often used as wrapper for Horde exceptions. I can't say for sure that every Horde exception is already using a numeric error code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember a time where it was not guaranteed that the code would be an int. This might have been fixed in PHP or the stubs. If psalm no longer complains without the cast then remove it.

@kesselb kesselb force-pushed the dependabot/composer/psalm/phar-5.1.0 branch 2 times, most recently from b032901 to bfec7d2 Compare December 13, 2022 11:11
@kesselb
build: update psalm baseline with php7.4
27a5ad4 
The UndefinedPropertyFetch warnings are fixed with PHP 8.1.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb force-pushed the dependabot/composer/psalm/phar-5.1.0 branch from bfec7d2 to 27a5ad4 Compare December 13, 2022 11:16
miaulalala
miaulalala approved these changes Dec 13, 2022
View reviewed changes
Copy link
Contributor

@miaulalala miaulalala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, so many psalm ignores removed!

@kesselb kesselb merged commit 86db0d4 into main Dec 13, 2022
@kesselb kesselb deleted the dependabot/composer/psalm/phar-5.1.0 branch December 13, 2022 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kesselb kesselb kesselb left review comments

@miaulalala miaulalala miaulalala approved these changes

@github-actions github-actions[bot] github-actions[bot] approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst ChristophWurst is a code owner

Assignees
No one assigned
Labels
3. to review dependencies php Pull requests that update Php code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kesselb @ChristophWurst @miaulalala